Skip to content

Improve merge queue support#1256

Merged
codykaup merged 5 commits intomainfrom
cody/cap-4234-cli-remove-existing-merge-queue-branch-name-changing-code
Apr 9, 2026
Merged

Improve merge queue support#1256
codykaup merged 5 commits intomainfrom
cody/cap-4234-cli-remove-existing-merge-queue-branch-name-changing-code

Conversation

@codykaup
Copy link
Copy Markdown
Contributor

@codykaup codykaup commented Mar 24, 2026

This PR is to improve merge queue support in two ways:

  1. Passing the real merge queue branch name to the Index
  2. Defaulting exitZeroOnChanges to false when running in a merge queue so that it fails in CI if there are diffs
📦 Published PR as canary version: 16.3.0--canary.1256.24203045106.0

✨ Test out this PR locally via:

npm install chromatic@16.3.0--canary.1256.24203045106.0
# or 
yarn add chromatic@16.3.0--canary.1256.24203045106.0

@codykaup codykaup self-assigned this Mar 24, 2026
@codykaup codykaup added minor Auto: Increment the minor version when merged release Auto: Create a `latest` release when merged labels Mar 24, 2026
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Mar 24, 2026

📦 Package Size: 5732 KB
✅ Compared to main: 0 KB 186b70d (5732 KB)

@codecov
Copy link
Copy Markdown

codecov Bot commented Mar 24, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 77.98%. Comparing base (186b70d) to head (2ee952f).
⚠️ Report is 8 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1256   +/-   ##
=======================================
  Coverage   77.98%   77.98%           
=======================================
  Files         189      188    -1     
  Lines        3624     3611   -13     
  Branches     1091     1088    -3     
=======================================
- Hits         2826     2816   -10     
+ Misses        686      683    -3     
  Partials      112      112           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@codykaup codykaup force-pushed the cody/cap-4234-cli-remove-existing-merge-queue-branch-name-changing-code branch 2 times, most recently from 8f58836 to 063d020 Compare March 31, 2026 20:41
@codykaup codykaup changed the title Remove merge queue parsing Improve merge queue support Mar 31, 2026
@codykaup codykaup force-pushed the cody/cap-4234-cli-remove-existing-merge-queue-branch-name-changing-code branch from 063d020 to 452d448 Compare April 9, 2026 15:13
@codykaup codykaup marked this pull request as ready for review April 9, 2026 15:26
@codykaup codykaup requested a review from a team April 9, 2026 15:26
Comment thread package.json
"resolutions": {
"any-observable": "^0.5.1"
"any-observable": "^0.5.1",
"lodash": "4.17.21"
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I ran into a weird issue with our Yarn Classic test that lodash updated and was causing a bunch of failures. Just setting this resolution fixed it.

Copy link
Copy Markdown
Contributor

@justin-thurman justin-thurman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! One minor nit.

Comment thread action-src/main.ts Outdated
@codykaup codykaup added this pull request to the merge queue Apr 9, 2026
Merged via the queue into main with commit e349222 Apr 9, 2026
21 checks passed
@codykaup codykaup deleted the cody/cap-4234-cli-remove-existing-merge-queue-branch-name-changing-code branch April 9, 2026 17:03
@chromatic-ci-bot
Copy link
Copy Markdown
Collaborator

🚀 PR was released in v16.2.0 🚀

@chromatic-ci-bot chromatic-ci-bot added the released Verdict: This issue/pull request has been released label Apr 9, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

minor Auto: Increment the minor version when merged release Auto: Create a `latest` release when merged released Verdict: This issue/pull request has been released

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants